bitkeeper revision 1.1236.1.216 (42527bfbE6fG4PF5bHcEOOoxGik5sw)

Trivial fixes.

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
index 5933725bf7f77a8e03785efc5ba5d62481c93734..3c23e57ae6175dbfb3074a21b4f40fb3fbe36c92 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
@@ -627,8 +627,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req)
                 (bio_add_page(bio,
                               virt_to_page(MMAP_VADDR(pending_idx, i)),
                               seg[i].nsec << 9,
-                              seg[i].buf & ~PAGE_MASK) <
-                 (seg[i].nsec << 9)) )
+                              seg[i].buf & ~PAGE_MASK) == 0) )
         {
             bio = biolist[nbio++] = bio_alloc(GFP_KERNEL, nseg-i);
             if ( unlikely(bio == NULL) )

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
index fb2d1169abe0caf36c752772763fc5ae38df3060..f1f620640b54a8c06d742150587cffa1db96bfbf 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
@@ -87,6 +87,8 @@ static int __init xencons_setup(char *str)
         n = simple_strtol( str+3, &q, 10 );
         if ( q > (str + 3) ) xc_num = n;
         break;
+    default:
+        break;
     }
 
     return 1;